Autogenerated HTML docs for v1.6.4.1-174-g32f4c
diff --git a/RelNotes-1.6.4.1.txt b/RelNotes-1.6.4.1.txt new file mode 100644 index 0000000..e439e45 --- /dev/null +++ b/RelNotes-1.6.4.1.txt
@@ -0,0 +1,46 @@ +GIT v1.6.4.1 Release Notes +========================== + +Fixes since v1.6.4 +------------------ + + * An unquoted value in the configuration file, when it contains more than + one whitespaces in a row, got them replaced with a single space. + + * "git am" used to accept a single piece of e-mail per file (not a mbox) + as its input, but multiple input format support in v1.6.4 broke it. + Apparently many people have been depending on this feature. + + * The short help text for "git filter-branch" command was a single long + line, wrapped by terminals, and was hard to read. + + * The "recursive" strategy of "git merge" segfaulted when a merge has + more than one merge-bases, and merging of these merge-bases involves + a rename/rename or a rename/add conflict. + + * "git pull --rebase" did not use the right fork point when the + repository has already fetched from the upstream that rewinds the + branch it is based on in an earlier fetch. + + * Explain the concept of fast-forward more fully in "git push" + documentation, and hint to refer to it from an error message when the + command refuses an update to protect the user. + + * The default value for pack.deltacachesize, used by "git repack", is now + 256M, instead of unbounded. Otherwise a repack of a moderately sized + repository would needlessly eat into swap. + + * Document how "git repack" (hence "git gc") interacts with a repository + that borrows its objects from other repositories (e.g. ones created by + "git clone -s"). + + * "git show" on an annotated tag lacked a delimiting blank line between + the tag itself and the contents of the object it tags. + + * "git verify-pack -v" erroneously reported number of objects with too + deep delta depths as "chain length 0" objects. + + * Long names of authors and committers outside US-ASCII were sometimes + incorrectly shown in "gitweb". + +Other minor documentation updates are included.
diff --git a/config.txt b/config.txt index 2632c51..5256c7f 100644 --- a/config.txt +++ b/config.txt
@@ -461,6 +461,14 @@ executed from the top-level directory of a repository, which may not necessarily be the current directory. +apply.ignorewhitespace:: + When set to 'change', tells 'git-apply' to ignore changes in + whitespace, in the same way as the '--ignore-space-change' + option. + When set to one of: no, none, never, false tells 'git-apply' to + respect all whitespace differences. + See linkgit:git-apply[1]. + apply.whitespace:: Tells 'git-apply' how to handle whitespaces, in the same way as the '--whitespace' option. See linkgit:git-apply[1].
diff --git a/git-am.html b/git-am.html index 9f1fbc5..aac18d3 100644 --- a/git-am.html +++ b/git-am.html
@@ -323,7 +323,7 @@ <div class="verseblock"> <div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--committer-date-is-author-date] - [--ignore-date] + [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--reject] [-q | --quiet] [<mbox> | <Maildir>…] @@ -423,6 +423,15 @@ </p> </dd> <dt> +--ignore-date +</dt> +<dt> +--ignore-space-change +</dt> +<dt> +--ignore-whitespace +</dt> +<dt> --whitespace=<option> </dt> <dt> @@ -609,7 +618,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-07-02 03:16:40 UTC +Last updated 2009-08-22 05:10:25 UTC </div> </div> </body>
diff --git a/git-am.txt b/git-am.txt index 32e689b..fcacc94 100644 --- a/git-am.txt +++ b/git-am.txt
@@ -11,7 +11,7 @@ [verse] 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--committer-date-is-author-date] - [--ignore-date] + [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--reject] [-q | --quiet] [<mbox> | <Maildir>...] @@ -65,6 +65,9 @@ it is supposed to apply to and we have those blobs available locally. +--ignore-date:: +--ignore-space-change:: +--ignore-whitespace:: --whitespace=<option>:: -C<n>:: -p<n>::
diff --git a/git-apply.html b/git-apply.html index da39515..bead4df 100644 --- a/git-apply.html +++ b/git-apply.html
@@ -325,6 +325,7 @@ [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] + [--ignore-space-change | --ignore-whitespace ] [--whitespace=<nowarn|warn|fix|error|error-all>] [--exclude=PATH] [--include=PATH] [--directory=<root>] [--verbose] [<patch>…]</div></div> @@ -559,6 +560,21 @@ on the command line, and ignored if there is any include pattern.</p></div> </dd> <dt> +--ignore-space-change +</dt> +<dt> +--ignore-whitespace +</dt> +<dd> +<p> + When applying a patch, ignore changes in whitespace in context + lines if necessary. + Context lines will preserve their whitespace, and they will not + undergo whitespace fixing regardless of the value of the + <tt>--whitespace</tt> option. New lines will still be fixed, though. +</p> +</dd> +<dt> --whitespace=<action> </dt> <dd> @@ -662,6 +678,16 @@ <div class="sectionbody"> <div class="vlist"><dl> <dt> +apply.ignorewhitespace +</dt> +<dd> +<p> + Set to <em>change</em> if you want changes in whitespace to be ignored by default. + Set to one of: no, none, never, false if you want changes in + whitespace to be significant. +</p> +</dd> +<dt> apply.whitespace </dt> <dd> @@ -699,7 +725,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-07-01 02:30:42 UTC +Last updated 2009-08-22 05:10:25 UTC </div> </div> </body>
diff --git a/git-apply.txt b/git-apply.txt index 735374d..5ee8c91 100644 --- a/git-apply.txt +++ b/git-apply.txt
@@ -13,6 +13,7 @@ [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] + [--ignore-space-change | --ignore-whitespace ] [--whitespace=<nowarn|warn|fix|error|error-all>] [--exclude=PATH] [--include=PATH] [--directory=<root>] [--verbose] [<patch>...] @@ -149,6 +150,14 @@ include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern. +--ignore-space-change:: +--ignore-whitespace:: + When applying a patch, ignore changes in whitespace in context + lines if necessary. + Context lines will preserve their whitespace, and they will not + undergo whitespace fixing regardless of the value of the + `--whitespace` option. New lines will still be fixed, though. + --whitespace=<action>:: When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is @@ -205,6 +214,10 @@ Configuration ------------- +apply.ignorewhitespace:: + Set to 'change' if you want changes in whitespace to be ignored by default. + Set to one of: no, none, never, false if you want changes in + whitespace to be significant. apply.whitespace:: When no `--whitespace` flag is given from the command line, this configuration item is used as the default.
diff --git a/git-config.html b/git-config.html index 33fad48..a7ff5f0 100644 --- a/git-config.html +++ b/git-config.html
@@ -1373,6 +1373,19 @@ not necessarily be the current directory.</p></div> </dd> <dt> +apply.ignorewhitespace +</dt> +<dd> +<p> + When set to <em>change</em>, tells <em>git-apply</em> to ignore changes in + whitespace, in the same way as the <em>--ignore-space-change</em> + option. + When set to one of: no, none, never, false tells <em>git-apply</em> to + respect all whitespace differences. + See <a href="git-apply.html">git-apply(1)</a>. +</p> +</dd> +<dt> apply.whitespace </dt> <dd> @@ -3470,7 +3483,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-08-13 01:22:24 UTC +Last updated 2009-08-22 05:10:26 UTC </div> </div> </body>
diff --git a/git-rebase.html b/git-rebase.html index 150c33c..e4a9bac 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -658,11 +658,14 @@ </p> </dd> <dt> +--ignore-whitespace +</dt> +<dt> --whitespace=<option> </dt> <dd> <p> - This flag is passed to the <em>git-apply</em> program + These flag are passed to the <em>git-apply</em> program (see <a href="git-apply.html">git-apply(1)</a>) that applies the patch. Incompatible with the --interactive option. </p> @@ -1127,7 +1130,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-07-02 03:16:40 UTC +Last updated 2009-08-22 05:10:26 UTC </div> </div> </body>
diff --git a/git-rebase.txt b/git-rebase.txt index db1b71d..0aefc34 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -268,8 +268,9 @@ exit with the message "Current branch is up to date" in such a situation. +--ignore-whitespace:: --whitespace=<option>:: - This flag is passed to the 'git-apply' program + These flag are passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. Incompatible with the --interactive option.
diff --git a/git-replace.html b/git-replace.html new file mode 100644 index 0000000..158727f --- /dev/null +++ b/git-replace.html
@@ -0,0 +1,407 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> +<style type="text/css"> +/* Debug borders */ +p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { +/* + border: 1px solid red; +*/ +} + +body { + margin: 1em 5% 1em 5%; +} + +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +tt { + color: navy; +} + +h1, h2, h3, h4, h5, h6 { + color: #527bbd; + font-family: sans-serif; + margin-top: 1.2em; + margin-bottom: 0.5em; + line-height: 1.3; +} + +h1, h2, h3 { + border-bottom: 2px solid silver; +} +h2 { + padding-top: 0.5em; +} +h3 { + float: left; +} +h3 + * { + clear: left; +} + +div.sectionbody { + font-family: serif; + margin-left: 0; +} + +hr { + border: 1px solid silver; +} + +p { + margin-top: 0.5em; + margin-bottom: 0.5em; +} + +pre { + padding: 0; + margin: 0; +} + +span#author { + color: #527bbd; + font-family: sans-serif; + font-weight: bold; + font-size: 1.1em; +} +span#email { +} +span#revision { + font-family: sans-serif; +} + +div#footer { + font-family: sans-serif; + font-size: small; + border-top: 2px solid silver; + padding-top: 0.5em; + margin-top: 4.0em; +} +div#footer-text { + float: left; + padding-bottom: 0.5em; +} +div#footer-badges { + float: right; + padding-bottom: 0.5em; +} + +div#preamble, +div.tableblock, div.imageblock, div.exampleblock, div.verseblock, +div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, +div.admonitionblock { + margin-right: 10%; + margin-top: 1.5em; + margin-bottom: 1.5em; +} +div.admonitionblock { + margin-top: 2.5em; + margin-bottom: 2.5em; +} + +div.content { /* Block element content. */ + padding: 0; +} + +/* Block element titles. */ +div.title, caption.title { + font-family: sans-serif; + font-weight: bold; + text-align: left; + margin-top: 1.0em; + margin-bottom: 0.5em; +} +div.title + * { + margin-top: 0; +} + +td div.title:first-child { + margin-top: 0.0em; +} +div.content div.title:first-child { + margin-top: 0.0em; +} +div.content + div.title { + margin-top: 0.0em; +} + +div.sidebarblock > div.content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} + +div.listingblock { + margin-right: 0%; +} +div.listingblock > div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock > div.content { + padding-left: 2.0em; +} + +div.attribution { + text-align: right; +} +div.verseblock + div.attribution { + text-align: left; +} + +div.admonitionblock .icon { + vertical-align: top; + font-size: 1.1em; + font-weight: bold; + text-decoration: underline; + color: #527bbd; + padding-right: 0.5em; +} +div.admonitionblock td.content { + padding-left: 0.5em; + border-left: 2px solid silver; +} + +div.exampleblock > div.content { + border-left: 2px solid silver; + padding: 0.5em; +} + +div.verseblock div.content { + white-space: pre; +} + +div.imageblock div.content { padding-left: 0; } +div.imageblock img { border: 1px solid silver; } +span.image img { border-style: none; } + +dl { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +dt { + margin-top: 0.5em; + margin-bottom: 0; + font-style: italic; +} +dd > *:first-child { + margin-top: 0; +} + +ul, ol { + list-style-position: outside; +} +div.olist2 ol { + list-style-type: lower-alpha; +} + +div.tableblock > table { + border: 3px solid #527bbd; +} +thead { + font-family: sans-serif; + font-weight: bold; +} +tfoot { + font-weight: bold; +} + +div.hlist { + margin-top: 0.8em; + margin-bottom: 0.8em; +} +div.hlist td { + padding-bottom: 5px; +} +td.hlist1 { + vertical-align: top; + font-style: italic; + padding-right: 0.8em; +} +td.hlist2 { + vertical-align: top; +} + +@media print { + div#footer-badges { display: none; } +} + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] +/* Workarounds for IE6's broken and incomplete CSS2. */ + +div.sidebar-content { + background: #ffffee; + border: 1px solid silver; + padding: 0.5em; +} +div.sidebar-title, div.image-title { + font-family: sans-serif; + font-weight: bold; + margin-top: 0.0em; + margin-bottom: 0.5em; +} + +div.listingblock div.content { + border: 1px solid silver; + background: #f4f4f4; + padding: 0.5em; +} + +div.quoteblock-content { + padding-left: 2.0em; +} + +div.exampleblock-content { + border-left: 2px solid silver; + padding-left: 0.5em; +} + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } +</style> +<title>git-replace(1)</title> +</head> +<body> +<div id="header"> +<h1> +git-replace(1) Manual Page +</h1> +<h2>NAME</h2> +<div class="sectionbody"> +<p>git-replace - + Create, list, delete refs to replace objects +</p> +</div> +</div> +<h2>SYNOPSIS</h2> +<div class="sectionbody"> +<div class="verseblock"> +<div class="content"><em>git replace</em> [-f] <object> <replacement> +<em>git replace</em> -d <object>… +<em>git replace</em> -l [<pattern>]</div></div> +</div> +<h2 id="_description">DESCRIPTION</h2> +<div class="sectionbody"> +<div class="para"><p>Adds a <em>replace</em> reference in <tt>.git/refs/replace/</tt></p></div> +<div class="para"><p>The name of the <em>replace</em> reference is the SHA1 of the object that is +replaced. The content of the replace reference is the SHA1 of the +replacement object.</p></div> +<div class="para"><p>Unless <tt>-f</tt> is given, the replace reference must not yet exist in +<tt>.git/refs/replace/</tt> directory.</p></div> +</div> +<h2 id="_options">OPTIONS</h2> +<div class="sectionbody"> +<div class="vlist"><dl> +<dt> +-f +</dt> +<dd> +<p> + If an existing replace ref for the same object exists, it will + be overwritten (instead of failing). +</p> +</dd> +<dt> +-d +</dt> +<dd> +<p> + Delete existing replace refs for the given objects. +</p> +</dd> +<dt> +-l <pattern> +</dt> +<dd> +<p> + List replace refs for objects that match the given pattern (or + all if no pattern is given). + Typing "git replace" without arguments, also lists all replace + refs. +</p> +</dd> +</dl></div> +</div> +<h2 id="_bugs">BUGS</h2> +<div class="sectionbody"> +<div class="para"><p>Comparing blobs or trees that have been replaced with those that +replace them will not work properly. And using <em>git reset --hard</em> to +go back to a replaced commit will move the branch to the replacement +commit instead of the replaced commit.</p></div> +<div class="para"><p>There may be other problems when using <em>git rev-list</em> related to +pending objects. And of course things may break if an object of one +type is replaced by an object of another type (for example a blob +replaced by a commit).</p></div> +</div> +<h2 id="_see_also">SEE ALSO</h2> +<div class="sectionbody"> +<div class="para"><p><a href="git-tag.html">git-tag(1)</a> +<a href="git-branch.html">git-branch(1)</a></p></div> +</div> +<h2 id="_author">Author</h2> +<div class="sectionbody"> +<div class="para"><p>Written by Christian Couder <chriscool@tuxfamily.org> and Junio C +Hamano <gitster@pobox.com>, based on <em>git tag</em> by Kristian Hogsberg +<krh@redhat.com> and Carlos Rica <jasampler@gmail.com>.</p></div> +</div> +<h2 id="_documentation">Documentation</h2> +<div class="sectionbody"> +<div class="para"><p>Documentation by Christian Couder <chriscool@tuxfamily.org> and the +git-list <git@vger.kernel.org>, based on <em>git tag</em> documentation.</p></div> +</div> +<h2 id="_git">GIT</h2> +<div class="sectionbody"> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +</div> +<div id="footer"> +<div id="footer-text"> +Last updated 2009-08-22 05:10:27 UTC +</div> +</div> +</body> +</html> diff --git a/git-replace.txt b/git-replace.txt new file mode 100644 index 0000000..915cb77 --- /dev/null +++ b/git-replace.txt
@@ -0,0 +1,71 @@ +git-replace(1) +============== + +NAME +---- +git-replace - Create, list, delete refs to replace objects + +SYNOPSIS +-------- +[verse] +'git replace' [-f] <object> <replacement> +'git replace' -d <object>... +'git replace' -l [<pattern>] + +DESCRIPTION +----------- +Adds a 'replace' reference in `.git/refs/replace/` + +The name of the 'replace' reference is the SHA1 of the object that is +replaced. The content of the replace reference is the SHA1 of the +replacement object. + +Unless `-f` is given, the replace reference must not yet exist in +`.git/refs/replace/` directory. + +OPTIONS +------- +-f:: + If an existing replace ref for the same object exists, it will + be overwritten (instead of failing). + +-d:: + Delete existing replace refs for the given objects. + +-l <pattern>:: + List replace refs for objects that match the given pattern (or + all if no pattern is given). + Typing "git replace" without arguments, also lists all replace + refs. + +BUGS +---- +Comparing blobs or trees that have been replaced with those that +replace them will not work properly. And using 'git reset --hard' to +go back to a replaced commit will move the branch to the replacement +commit instead of the replaced commit. + +There may be other problems when using 'git rev-list' related to +pending objects. And of course things may break if an object of one +type is replaced by an object of another type (for example a blob +replaced by a commit). + +SEE ALSO +-------- +linkgit:git-tag[1] +linkgit:git-branch[1] + +Author +------ +Written by Christian Couder <chriscool@tuxfamily.org> and Junio C +Hamano <gitster@pobox.com>, based on 'git tag' by Kristian Hogsberg +<krh@redhat.com> and Carlos Rica <jasampler@gmail.com>. + +Documentation +-------------- +Documentation by Christian Couder <chriscool@tuxfamily.org> and the +git-list <git@vger.kernel.org>, based on 'git tag' documentation. + +GIT +--- +Part of the linkgit:git[1] suite
diff --git a/git.html b/git.html index 2c6bf36..7d74577 100644 --- a/git.html +++ b/git.html
@@ -2044,7 +2044,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-08-13 01:22:27 UTC +Last updated 2009-08-22 05:10:27 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index 5832c75..a9bacfb 100644 --- a/git.txt +++ b/git.txt
@@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.4/git.html[documentation for release 1.6.4] +* link:v1.6.4.1/git.html[documentation for release 1.6.4.1] * release notes for + link:RelNotes-1.6.4.1.txt[1.6.4.1], link:RelNotes-1.6.4.txt[1.6.4]. * link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
